From: Florian Müllner <fmuellner@gnome.org>
Date: Mon, 23 Mar 2020 15:14:47 +0000 (+0100)
Subject: keyboard: Fix fallback layout when using variants
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~751^2^2~84
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=d29e5765badbca21a6ef8b40087a8e3587b15dd4;p=gnome-shell.git

keyboard: Fix fallback layout when using variants

Commit c1ec7b2ff meant to fall back to the base layout in case
a variant like `fr+oss` is set up, but as we are checking for
'+' on the array rather than the layout name, the fallback only
"works" for a layout that is literally called '+', whoops.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2471
---

diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index 635d9b12e..7d56ef9c8 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -498,7 +498,7 @@ var Key = GObject.registerClass({
 var KeyboardModel = class {
     constructor(groupName) {
         let names = [groupName];
-        if (names.includes('+'))
+        if (groupName.includes('+'))
             names.push(groupName.replace(/\+.*/, ''));
         names.push('us');